From f47a84f2332081213887b42dd8704f230d6b52d2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 26 May 2019 22:22:40 -0400 Subject: [PATCH] image: Make final --- gtk/gtkimage.c | 12 ++++++++++++ gtk/gtkimage.h | 27 --------------------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index b43edd7a41..215797a931 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -76,6 +76,18 @@ * property. */ +typedef struct _GtkImageClass GtkImageClass; + +struct _GtkImage +{ + GtkWidget parent_instance; +}; + +struct _GtkImageClass +{ + GtkWidgetClass parent_class; +}; + typedef struct { diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 87f47bb7be..722d40c0bc 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -38,14 +38,9 @@ G_BEGIN_DECLS #define GTK_TYPE_IMAGE (gtk_image_get_type ()) #define GTK_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE, GtkImage)) -#define GTK_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE, GtkImageClass)) #define GTK_IS_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE)) -#define GTK_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE)) -#define GTK_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE, GtkImageClass)) - typedef struct _GtkImage GtkImage; -typedef struct _GtkImageClass GtkImageClass; /** * GtkImageType: @@ -73,28 +68,6 @@ typedef enum GTK_IMAGE_PAINTABLE } GtkImageType; -/** - * GtkImage: - * - * This struct contain private data only and should be accessed by the functions - * below. - */ -struct _GtkImage -{ - GtkWidget parent_instance; -}; - -struct _GtkImageClass -{ - GtkWidgetClass parent_class; - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; - GDK_AVAILABLE_IN_ALL GType gtk_image_get_type (void) G_GNUC_CONST; -- 2.30.2